Prepare for i686-only MINGW builds #129
Merged
+8
−29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When deploying curl-8.11.0-2, a problem needed to be worked around: that cURL version, v8.11.0, had a bug that needed to be fixed, but the fix could not be deployed because of that bug. To work around this problem, the `build-and-deploy` workflow needed to force-downgrade the `curl` package. This workaround is no longer needed, therefore we can drop it. Signed-off-by: Johannes Schindelin <[email protected]>
When this workflow is run in "build-only" mode, we do not want to deploy the package and therefore it is not necessary to check whether the package has been deployed already. Signed-off-by: Johannes Schindelin <[email protected]>
In the future, we want to build the packages in the appropriate git-sdk for the given CPU architecture. Right now, we still build i686/x86_64 MINGW packages in git-sdk-64. Let's respect the `ARCHITECTURE` environment variable (which is left empty in the current workflow runs that want to build i686/x86_64 MINGW packages), and set `MINGW_ARCH` appropriately when the `ARCHITECTURE` is set to `i686` or `x86_64` (which we will do in the future). Signed-off-by: Johannes Schindelin <[email protected]>
|
Here is a test run for i686 |
I should have known better than to regenerate a current package version (for which the "are the Pacman repositories in sync?" check must fail because the newly-generated package cannot be byte-for-byte identical to the currently deployed one)... So here is my next attempt at verifying that this works as intended. |
And that worked! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the context of git-for-windows/git#5401 ("Drop all i686 stuff from git-sdk-64"), this PR adjusts a few files so that the
build-and-deployworkflow will run successfully ingit-sdk-32(it currently runs ingit-sdk-64, unlike when thegit-artifactsbuildsmingw-w64-i686-git, wheregit-sdk-32is used already).The
build-and-deployworkflow will continue as before, as it will only make a difference when thearchitectureis set toi686orx86_64to build a MINGW package (and currently, thearchitectureis left empty for those).